From bebaf7c296518bf9cec24773c8da1e6823fff5fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 26 Sep 2022 11:13:31 +0200 Subject: [PATCH] drivers/char: add console=ehci as an alias for console=dbgp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Make it consistent with console=xhci. Suggested-by: Jan Beulich Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 4 ++-- xen/drivers/char/serial.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index bbb4652bbf..68389843b2 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -409,7 +409,7 @@ The following are examples of correct specifications: Specify the size of the console ring buffer. ### console -> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | xhci | none ]` +> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | ehci | xhci | none ]` > Default: `console=com1,vga` @@ -428,7 +428,7 @@ cleared. This allows a single port to be shared by two subsystems `pv` indicates that Xen should use Xen's PV console. This option is only available when used together with `pv-in-pvh`. -`dbgp` indicates that Xen should use a USB2 debug port. +`dbgp` or `ehci` indicates that Xen should use a USB2 debug port. `xhci` indicates that Xen should use a USB3 debug port. diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 9d94450392..00efe69574 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -311,6 +311,12 @@ int __init serial_parse_handle(const char *conf) goto common; } + if ( !strncmp(conf, "ehci", 4) && (!conf[4] || conf[4] == ',') ) + { + handle = SERHND_DBGP; + goto common; + } + if ( !strncmp(conf, "xhci", 4) && (!conf[4] || conf[4] == ',') ) { handle = SERHND_XHCI; -- 2.30.2